Merge from trunk.
authorPaul Eggert <eggert@cs.ucla.edu>
Mon, 20 Jun 2011 22:03:52 +0000 (15:03 -0700)
committerPaul Eggert <eggert@cs.ucla.edu>
Mon, 20 Jun 2011 22:03:52 +0000 (15:03 -0700)
commit8a687ad42ecc9e6ed060278a14f0a5106762cb70
treecbfaa5472a8168c9d280b11b97d1232e2b87f5b7
parentcc1f0170fd45078567c3da1f7e1727ac4f96770d
parentb1db12ce3be7362656c83f24c2a0c70ae9541490
Merge from trunk.